[UPDATE] minor changes
[UPDATE] version bump
[BUGFIX] solved conflicts