Initial commit; direct copy
Updates to match Go 1