Saved State

Added Saved State
Revert "Saved State"

This reverts commit ece83eed749faab6c131238a7ab1852f307c5958.
Merge remote-tracking branch 'upstream/master'
updated with saved state
Merge pull request #170 from rimusz/saved-state-status

Saved state and status update