Improved verifier
Merge branch 'master' of github.com:dhoepelman/in4336