commit POJ1240
Merge pull request #413 from whimsycwd/master

commit POJ1240 by TA