Rearranged by Xuan
Merge pull request #3 from michael0401/patch-3

Rearranged by Xuan