Correction
Removal redundant code
Documentation correction
Bugfix