final submission
Merge pull request #95 from mtrester/master

Morgan Trester