Issue #4

Made corrections to fix Issue 4 along with a few other very minor changes in the same vein.