Merge pull request #13 from Nuffield/dev_bugfix

Dev bugfix
(master br)file created under master branch of fox3
modified under dev_bugfix br