v2.1.5

Improved robustness and minor fixes