Fix bugs
Preparing release 1.18
Back to development: 1.19