a16 improved input checking && Makefile fix
Merge branch 'master' of https://github.com/tnias/tubsassign

totally necessary