newer scanner
Merge https://github.com/bkold/lab5