Significant improvements
Merged
2.1.0