fallback logic on freebase
Merge pull request #15 from cah13/updated-freebase

fallback logic on freebase