Fix some errors and lifecycle operations
Merge pull request #29 from rajthilakmca/master

Fix some errors and lifecycle operations