20140512 by Chawachote A.
20140512 by Chawachote A.
Merge palm/master