Merge pull request #10 from Nuffield/dev_bugfix

Dev bugfix
adding changes