wordcloud fixed, other fixes
Merge pull request #33 from ne0n666/master

wordcloud fixed, other fixes