refactored endtoend
Merge branch 'dev' of https://github.com/nromanen/ch017 into dev