[fixed] merge with task 5
Merge branch 'master' of https://github.com/agilejs/2014-10-typesafe