Using DOM API
Merge pull request #1 from ym405nm/fix-security-issues

Using DOM API