Version 2.0. Added verify command and small fixes.