added check for mapper
Merge branch 'master' of https://github.com/ariantay/RIV-TOUR-BUILD_140203