merge with recent
Merge branch 'master' of https://github.com/jingdiren/secureim
added validation helper