MERGE test pull request

Fixes #11