no local import (go1.1+); move to test file
Merge pull request #3 from jehiah/refactoring_3

go1.1+ compatability (api change)