Merge development into master for version 2.0.0