Merge pull request #39 from murrekatt/develop

Removed unnecessary flags.