bugFix_0.2.1
merge