v 2.0.0 fixes
Merge branch 'master' of https://github.com/attm2x/m2x-dot-net