fixed basic features for ver 0.2