code cleanup, added Collection Content, removed unused dependencies
Merge branch 'release/0.2.0'