Compatibility with Go 1.1.1

Adapted code to run under Go 1.1.1