Implemented save instance state
Merge branch 'dev'