lots of performance improvements
Merge branch '2.0'