Merge pull request #91 from go-distributed/proj3

Merge into master