Changed a few things...
Merge pull request #8 from rmtmckenzie/Morgan

Changed a few things...