Fixed #8 , Fixed #6