infinite loop fixed
Merge branch 'master' of https://github.com/d601/KodeKonkurrenz into aaron
ace fix