Merge pull request #39 from jeroenk/refactor-fix

Re-instate essential line removed in refactoring
Merge branch 'master' into gpu