Merge pull request #7 from braidlabs/master