Merge development into master for release 2.0.1