Adds more cli parameters and fixes windows tests
Merge pull request #8 from JamesClonk/windows_fixes

Adds more cli parameters and fixes windows tests