A few more object
Merge branch 'master' of https://github.com/Heia-/Imagine