Complete assignment 1.
Merge pull request #5 from daf-/scanner

Complete assignment 1.