Strict mode fixes to adapter
Merge pull request #17 from plyfe/master

Strict mode fixes to adapter