Closes #3

This should allow you to build under go1.1.2.