Merge pull request #9 from kohler/master

Scan stuff