Merge pull request #1 from hamburgerkid/develop

Adopt command line arguments. Merged