Merge pull request #14 from RobinD42/minor-tweaks

Minor tweaks
Merge branch 'master' into dev