Add current 2 peer configuration
Merge branch 'master' of https://github.com/n00shie/fuzzy-octo-ironman