some small forgoten commits
corrected merge
Merge branch 'master' of https://github.com/limno/gefes