Latest changes from master. Bumped version