Rebase
Merge pull request #88 from wmde/range

Fix two Scruntinizer issues