More instances working
Merge branch 'master' into throw