updated
Merge branch 'master' of github.com:shaunsauve/reference