Merge pull request #3 from gsyarov/master

1
Revert "1"
Merge pull request #4 from gsyarov/revert-3-master

Revert "1"
Merge pull request #5 from gsyarov/old-state

Old state