Merge pull request #16 from RobinD42/more-tweaks

More tweaks
Merge branch 'master' into dev