Merge pull request #248 from aesedepece/master

Command line merge for #244