Updated objects
Merge pull request #13 from Bloc/objects

Updated objects