Merge pull request #432 from hean01/master

A few fixes.