Merge pull request #383 from hjl-tools/hjl/master

Hjl/master