Related to ref #1069
Merge pull request #318 from siad007/patch-1

Fixes #1069