Minor compatibility and performance improvements
0.2.1