Some bugfixes and codechanges inside captha and code2.
Merge branch 'master' of github.com:LEPTON-project/LEPTON_2