Fixes #12
Merge branch 'master' of github.com:climatewarrior/p2p-app