issue #996
issue #969
issue #996 minor update
issue #996 minor update
Merge pull request #1003 from ahmetmircik/issue996

Issue996