Merge pull request #6 from CaliOpen/develop

Develop
naming consistency: do not use <object>_type only type
consistency and no more <object>_type
Merge pull request #7 from gdchamal/return_object

Return object