Merge pull request #26 from mkalb/develop

Checkstyle fixes and ImageBundle