Added tests
Merge pull request #4 from alessioalex/master

Added tests; Closes #3