Merge pull request #14 from Nuffield/dev_bugfix

+2 added
modified under dev_bugfix br
Merge remote-tracking branch 'origin/bugfix' into dev_bugfix
changed
(dev_bugfix) for the defect 123
Merge pull request #15 from Nuffield/bugfix

fill all the changes from Bugfix