Fixes #21
Merge