Merge pull request #63 from efuquen/strict-mode_2.10

Strict mode 2.10