Merge pull request #481 from techee/go