Merge branch 'develop'
Forgot to remove commented map calls
Merge branch 'master'