1st optimizations
Merge branch 'master' of https://github.com/ntuckovic/styria