Resovling issue #924
Merge remote-tracking branch 'upstream/master'
Move using-statements inside namespace
Merge pull request #930 from marcusoftnet/master

Fix for Issue #924