new tests passing
Merge pull request #16 from smirolo/master

new tests passing