Update to new working version
Merge branch 'master' of https://github.com/lbybee/work_projects