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

Rearranged by Xuan