finish part 6
Merge branch 'master' of https://github.com/NEO-IE/stage1ptn