Further optimization
Bump to 0.2.1
Merge branch 'release/0.2.1' into develop