modifying file under dev_bugfix branch !!!
Merge pull request #3 from Nuffield/dev_bugfix

modifying file under dev_bugfix branch !!!
Merge pull request #4 from Nuffield/bugfix

Bugfix to master!