new rspec syntax
Merge branch 'develop' of github.com:AndreySavelyev/hahashie into develop