from def123 branch to bugfix_local branch
+1 added from def123 branch
Merge pull request #16 from Nuffield/bugfix

Bugfix to bugfix_main