Merge pull request #54 from wtangiit/master

go 1.0 compatibility