Merge pull request #100 from go-distributed/master

Merge pull request #99 from go-distributed/proj3