Merge pull request #12 from RobinD42/add-new-options

Add new options
Merge pull request #13 from RobinD42/more-build-tweaks

More build tweaks and fixes
Merge branch 'master' into dev