Fixes #42
Merge branch 'master' of https://github.com/oliverdrake/ucbc
Fixes #41