Adding latest changes and bumping version