before merge bugFix_0.2.1