Merge pull request #128 from ihptru/master

corrections