Prepared for the development of version 2.1.0