Merge pull request #94 from remicollet/issue-strict2

more strictness