Merge pull request #1 from Nuffield/dev_bf_1

first change from dev branch
Merge pull request #4 from Nuffield/bugfix

Bugfix to master!
Merge branch 'master' into dev_bugfix
(2) mofiled from fox client - dev_bugfix branch