FIX: https://github.com/beetleskin/peernet/issues/15
Merge branch 'master' of github.com:beetleskin/peernet