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