issue #26 - added peer support