Revert "Merge pull request #1 from ghhoward/master"
Merge pull request #3 from ghhoward/revert-2-is210-2014-fall-02

Revert "Merge pull request #1 from ghhoward/master"