Updated libraries
Merge branch 'master' of github.com:tonyklawrence/template