Merge pull request #405 from hean01/master

A few fixes.