Merge pull request #133 from ihptru/master

fix regressions, corrections