Make tests pass
Merge pull request #1 from retupmoca/master

Make tests pass