fixes #5
merge