Fixes #5
Merge branch 'dev' into optparse