working on CLI thread
Merge branch 'master' of github.com:epicpants/P2P