Fixes #17
merge