Merge pull request #4 from akumuli/dev

Dev
Merge pull request #5 from akumuli/dev

Dev
Merge branch 'master' into dev