Added more initializations and terminations
Merge pull request #803 from tambry/InitilizationsAndTerminations

Added more initializations and terminations