Merge pull request #22 from joshreed13/develop

Refactored to Improve Caliburn.Micro Implementation