Final changes before submission
Merge pull request #27 from rmtmckenzie/Morgan

Final changes before submission