Merge pull request #138 from ihptru/master

fixes