Bug fix in MainActivity.
Merge
Merge pull request #34 from ro3289/bosh_merge

Bosh merge