Merge pull request #1 from loqui/dev

merge
Fix #458
Merge pull request #460 from bdcomp/fix-#458

Fix #458