Imported code from existing project
Starting fix of test suite
Merge pull request #3 from iambrosi/master

New Code