Merge pull request #91 from go-distributed/proj3

Merge into master
Merge pull request #93 from go-distributed/master

Merge pull request #91 from go-distributed/proj3