+ more tests, refactoring & bugfixes, readme updated