Merge pull request #31 from shwetank/master

Various fixes
Merge pull request #32 from shwetank/master

Fixes for inspecting popups