Merge pull request 'I LOVE OBJECTS!!' (#517) from wowee into develop