Added smarter changeset handling
Bumped version