adjust how objects are managed
Merge branch 'hotfix/0.2.0'