Merge pull request #20 from ro3289/YLC

Ylc
ok
ok
ok
maybe
Arror exception addressed.
local merge
Conflict solved.
Done
Merge
MM
merge
merge
Merge pull request #24 from ro3289/jane4

Jane4
done
done
done