some bug fixes
Merge branch 'master' of git@github.com:GKIFreiburg/gki_sickrd2014.git