fixed crash for now
Merge branch 'master' of https://github.com/socialSearch/socialSearch into huyphamily
Merge pull request #56 from socialSearch/huyphamily

fixed crash for now