some improvements
Merge branch 'master' of github.com:HSR-Stud/Optimiz