dicej Merge pull request #560 from jamesmstone/patch-1 …