Added modes to MapView
Nil checks for order data
Merge branch 'master' of https://github.com/loopyz/nommit