Merge branch 'master' of /home/xynon/workspace/Captchalize with conflicts.
Begin to write the runner class.