Update with changes from 1.1.6