Added logic to handle objects
Merge branch 'milestone-2' of github.com:TheiaRobo/Theia into milestone-2