Merge pull request #104 from hazendaz/master

Fixing tests
Merge pull request #105 from hazendaz/master

Code Cleanup