Merge pull request #132 from llh1/master

Update master from development 1.4.0.0.4