Small optimization
Few improvements
Bump version