Closed #5
and Fixed #6