fix_bug-0.1
Merge branch 'fix_bug-0.1'