Adding in the latest updates
Merge branch 'master' of https://github.com/awoody/wedding