nate-strauser Merge pull request #36 from openp2pdesign/master