update
Merge branch 'master' of https://github.com/p2pjack/p2pjack