0.2.1 Release - ci changes
Merge branch 'release/0.2.1' into develop