fixes #2
merge