PR 3 from original repo

Recreate Mark Story's PR no: 3 from original repo