Move default return to end of function for Go 1.0 compat
Merge pull request #1 from bruth/patch-1

Move default return to end of function for Go 1.0 compat