Remove compiler error

I got an error "function ends without a return statement" on go1.0.2
Merge pull request #96 from ericfrederich/eric_dev

Remove compiler error