fix #2 and tests
Merge pull request #13 from aenario/master

fix #2 and tests