Merge pull request #4 from NatCain/Nathaniel1

Nathaniel1
Merge remote-tracking branch 'origin/master' into Nathaniel1