Version 1.10

Merge bugfixes from 1.8 and 1.9