fixes #7
Merge commit