.
.
.
.
.
.
.
Merge pull request #177 from kiranhugo/obsplatform-1.01

Obsplatform 1.01
planmapping conflicts