Reverting my changes for #245
Merge branch 'master' into 263-fix