#4 : Corrected minor bugs