Add more changes
Merge pull request #31 from rmtmckenzie/Morgan

Add more changes