Issue #281
Merge pull request #291 from orionll/patch-2

Issue #281