all tests passing now, yay
Merge pull request #16 from zmontesd/master

tests are now passing!