quick update
Merge branch 'master' of github.com:glasperfan/personal-1