Fixes #39
Merge branch 'test' into ciims