fixes #3
merge