Started task #13
Merge branch 'master' of git://github.com/agilejs/ermahgerd