Working Update
Merge branch 'master' of https://github.com/peng-howard/peng-howard.github.com