bug fixes and test refactoring, added keywords to package.json and
version bump