Possible fix for #107
Fix for #108
Merge pull request #109 from patch-e/master

Fixes for Browser view controller related issues in #107 and #108