Merge pull request #1 from johnpaulwelsh/master

Pulling master into gh-pages for iProject 2