Updated tests and dependencies
Merge pull request #47 from jcristovao/master

Updated tests and dependencies