images finished?
Merge github.com:tenmilestereo/inferno
Merge github.com:tenmilestereo/inferno