Hotfix v0.2.1 (Following)
Merge branch 'hotfix' into dev

* hotfix:
  Hotfix v0.2.1 (Following)