Fix #154
Merge pull request #162 from Xefir/fix-scanner

Fix #154