Fixed #246 on master
Merge pull request #248 from lyncodev/fix-246-master

Fixed #246 on master