V0.9: Patch from github #44