Merge pull request #154 from anandpdoshi/master

Changes due to modified dom.js in framework