Issue #281
Merge pull request #282 from orionll/patch-1

Issue #281
Merged from upstream/master