Merge branch 'bugfix' of https://github.com/Nuffield/fox.git into dev_bugfix
Merge branch 'bugfix' of https://github.com/Nuffield/fox.git into dev_bugfix
Merge pull request #9 from Nuffield/bugfix

Bugfix
(5)
Merge branch 'master' of https://github.com/Nuffield/fox into dev_bugfix