Merge pull request #15 from jortel/gofer-1.0

Update master with latest 1.0 work.