Merge pull request #16 from rjeczalik/master

Workaround build -v ./... failing with 1 for go1.3
Merge pull request #17 from rjeczalik/master

Attempt no 2: workaround build -v ./... failing with 1 for go1.3