optimization
Merge branch 'master' of github.com:htwg/UCE