working on wikipedia
cleanup
cleanup
tweaks as requested
Merge pull request #7 from h4ck3rm1k3/master

Working for wikipedia