Fixes #216
Merge pull request #219 from aesedepece/fix-for-issue-216

Fixes #216
Merge remote-tracking branch 'upstream/master'