Fixing a couple random bugs and completing Issue #1.
Merge pull request #5 from SerenitySoftwareLLC/develop

Fixing a couple random bugs and completing Issue #1.