Merge pull request #236 from manolo/master

Fix tests
Merge pull request #238 from manolo/master

done