Merge pull request #28 from tadpol/master

Repair regressions