Potential fix for #8
Merge branch 'master' into image-state-fix
Merge branch 'master' into view-controller-fix