Merge pull request #40 from vikramrajkumar/btsx

Merge upstream