merged into master for version 2.0.1