Working on DOM-Calvin's fixes
Merge pull request #19 from berjoyner/master

Working on DOM-Calvin's fixes