Merge pull request #296 from slonopotamus/dash-dash-dash-dash-dash-dash

Fix '--' handling #296