Some Bug Fixes and Improvements
Merge branch 'master' of https://github.com/quemb/QMBTabs