Working on fixing tests and cleaning the code up
Replacing the deprecated Set class with Hash
Merge pull request #1 from CakeDC/develop

Develop