Release v2.1.0: fix #13, ongoing #14