<enhfncement/hybrid-map> change map type #141
<stable/0.1> Merge branch 'enhfncement/hybrid-map' into stable/0.1