add captcha stuff
bugfix #8
Merge branch 'bugfix_8' into dev