Manual merge
Fixes #18