Fixing all the bugs for last release