Merge pull request #97 from alfredodeza/master

Tests and fixes for issue #94