Fixed bug from 2.3.18 release as discussed in pull request #46
Reverting change to test for pull request #46
Tidied up some more whitespace inconsistencies