Getting all the tests to pass
Merge pull request #23 from alxdarksage/develop

Getting all the tests to pass