fix #17
fix #11 ?
Merge branch 'import_tweets'