Patch to Support use strict
Fixes Issue #206
(manual merge due ot other changes)
Patch to suppoer use strict
Fixes Issue #205
Manual merge due to other changes