Added MergeMixin
code cleanup
Version bump