kaniini Merge pull request #7 from arlolra/verify