fixing issue #396
Merge pull request #398 from timothyswt/master

fixing issue #396