Merge pull request #10 from SerenitySoftwareLLC/develop

Adding new, friendly demo url.
Merge pull request #13 from SerenitySoftwareLLC/develop

Doing some refactoring to get ready for unit test revamp.