Fix #232
Fix #233
Merge branch 'master' into anna