Fixed #95 , #96, #98