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

code merged with tos branch
.
Merge remote-tracking branch 'upstream/obsplatform-1.01' into obsplatform-1.01