Implements #47 and fixes a few bugs on google/youtube/wiki modules