Merge with existing fork

Fixes #1