missing commit in master

for some reason this commit was included in the `version-0.1.4` tag, but it's not in master