Fix strict mode bugs
Merge pull request #1 from brianpeiris/master

Fix strict mode bugs