Implementing suggested fix for #7 on official project repository.