v1.0.6. Improvement.
v1.0.7. Improvement.