Merge pull request #13 from juancjara/map_features

Map features
fixed navigation bug
Merge remote-tracking branch 'origin/master' into map_features