Cleaned up the images controller
Merge pull request #87 from j3rn/develop

Cleaned up the images controller