refactor
Merge branch 'master' of github.com:rhokinbraam/peer_marker