added features for v1.0.2