Patch issue 459
Merge pull request #460 from Cadair/staging

Patch issue #459