Adding latest bug fixes