Manual merge
Fixes #14