Merge branch 'testing'

Fixes #1