Patch 107 (Issue 107 resolve)

This seemed like the best way to do this. ~~I apologize that my name is inconsistent throughout these commits, but~~ the work is done now to present date.

Edit: This is the work that @moly wanted to see merged in from #107 .

Edit 2: I added the missing data to my account to remedy this name-changes-a-lot thing for all past and future ndeavors