Merge pull request #74 from plaprade/master

Factoring standard command line options