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

Fix code which do not work in strict mode