Refactoring DOM access
bugfixes, refactorings
Added wikipedia example