IMPROVE tests
ADD more tests
Merge pull request #16 from jsmolina/add-tests

Add tests and IMPROVE