Improve the performance of the project with few bug fixed
Imporved performance with some bug fixes