Incorporating MarkFo's changes from Pull Request #7
Incorpoarting Mark Foltz changes from pull request #7.
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages