Fix for Issue #86
Merge pull request #102 from kipe/wikipedia

Fix for Issue #86