Merge pull request #138 from llh1/master

Update master from development 1.2.0.2.2