Merge pull request #5 from ncdc/fix-double-dash-termination

Fix handling of -- termination