TASK-8: Fix P2P
Merge pull request #23 from DanLatimer/topic/TASK-8

TASK-8: Fix P2P