Changing to be more in line with base project
Merge branch 'master' of github.com:stewsters/goapj