make work with go 1.2
Merge pull request #2 from anuaimi/master

make work with go 1.2