Merge pull request #2 from elithrar/master

Updated to Support Go 1.1.1