fixed location issue
add wikipedia links
Merge branch 'gh-pages'