140807 update
Merge branch 'master' of https://github.com/whitia/Wikipedia-Search
140807 update