An update of recent changes.
Merge branch 'master' of https://github.com/flyingace/Portfolio