Preparing release 3.0.0
Back to development: 3.0.1
resolved merge conflicts after merging master