Merge pull request #18 from tlivings/master

Path fixes, additional CLI options.