Fixes #7
merge
merge fix
Fixes #7