Merge pull request #3 from Nuffield/dev_bugfix

modifying file under dev_bugfix branch !!!
committing changes from dev_bugfix to remote/bugfix