+2 added
Merge pull request #14 from Nuffield/dev_bugfix

+2 added