Merge pull request #930 from marcusoftnet/master

Fix for Issue #924