release v2.1 - general bugfixes, new options