updated for gerard
Merge branch 'master' of https://github.com/gmgj/Personal