New classes and tests.
Merge pull request #3 from davidamoen/develop

New classes and tests.