UPDATE: https://github.com/beetleskin/peernet/issues/17
Merge branch 'master' of github.com:beetleskin/peernet