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.