Fixed LifeCycle management issues #22 and #23.