Merge pull request #133 from llh1/master

Update master from development 1.2.0.6.0