Fixed : Issue #5