final changes before submission
Merge pull request #33 from rmtmckenzie/Morgan

final changes before submission