Fixed compile errors and ran go test. Things seem to be happy now.
Merge pull request #13 from densone/master

Fixed compile errors and ran go test. Things seem to be happy now.