Merge pull request #17 from proctopj/proctopj

Proctopj
Two small bugs
Merge pull request #1 from MiamiOH-CSE274/proctopj

Proctopj