Strict mode support

fixes #129 and #130