fix stupid performance issues
Merge pull request #2 from johannhof/master

fix stupid performance issues