Fixed #392
Merge pull request #394 from N0U/master

Fixed #392