Merge pull request #20 from eparis/optional-args

Fix '--flag arg' and Allow flags to take optional arguments