Fixes #30. Ready to start more tests before release v0.3.3