task #1
task #2
Merge pull request #69 from Neodelf/fixes

Fixes
Merge branch 'dev' of github.com:lvl0nax/topaza