Merge pull request #12 from Nuffield/dev_bugfix

Dev bugfix - (6) added changes
+2 added