20140508 by Chawachote A.
Merge palm/master