Refactor image change controller
Merge pull request #88 from ironcladlou/imagechange-refactor

Refactor image change controller