Fixing issue #368.
Merge pull request #387 from onlywade/master

Fixing issue #368.