Issues5+9

For mapbox/MBXMapKit issues https://github.com/mapbox/mbxmapkit/issues/5 and https://github.com/mapbox/mbxmapkit/issues/9