A few improvements
Bumped version