sync with DOM
Merge pull request #244 from annevk/patch-2

sync with DOM