Add patch from Pawel Sabat [Fixes #6]