Merge pull request #389 from vikramrajkumar/develop

Merge master
Merge branch 'develop' into btsx