Merge pull request #97 from SeattleMeshnet/master