Merge pull request #99 from go-distributed/proj3

Merge into master