Round 1
Merge pull request #74 from zshannon/master

Round 1 Update