Fix for behavioral bugs after changing a view controller.
Merge pull request #177 from XeresRazor/master

Fix for behavioral bugs after changing a view controller.