Reverted PR #96
Merge pull request #97 from thomjjames/bugfix/revert_pr96

Reverted PR #96