Peformance tuning
Bump version 0.2.1