Merge conflict fixed
Small fix in tests
Merge branch 'master' into Storeable
finally without merge conflicts
Merge pull request #337 from pershik/Storeable

Першаков Николай, 394 группа, Storeable