fixes #117
merge