Merge pull request #355 from frankwallis/v1-stable

[v1] update lifecycle methods to be compatible with [email protected]

Author: silvenon