Fix lifecycle operations
Merge pull request #31 from rajthilakmca/master

Fix lifecycle operations