Fix code which do not work in strict mode
Fix indent
Merge pull request #611 from phanect/strict-mode

Fix code which do not work in strict mode