Resolve issue #949
Merge pull request #1123 from hurtonm/master

Resolve issue #949