Code

Fixed compatibility issues with Go 1.0 and 1.1.