committing changes from dev_bugfix to remote/bugfix
Merge pull request #5 from Nuffield/dev_bugfix

committing changes from dev_bugfix to remote/bugfix