Bugfixes + new tests + README.md