fixed stopping problem
Merge branch 'master' of https://github.com/gfliess/2013-06-Modul2.git