Minor changes to code
Merge branch 'master' of https://github.com/Skjulet/Mapper