Merge pull request #2 from LiquidThinking/master

pull changes from origin
Merge pull request #3 from adeel41/master

pull changes from origin
fixed #16 to invoke correct constructor when switching screens
Merge pull request #17 from adeel41/dev

fixed #16 by invoking correct parameter