Fixed #21 in original repo

Hi I've fixed the issue. Olease review it.