Updates
Merge branch 'master' of https://github.com/gregturn/getting-started-base