Issue #95

refactored the verification.

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>