Merge branch 'master' into gh-pages
catching up
added additional contact info
added additional contact info - spaces
Merge branch 'gh-pages'