Merge pull request #6 from akumuli/dev

Dev
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' into dev