Merge pull request #1 from Fritz-Lium/master

some fixes
vote count
Merge pull request #2 from funkyLover/master

vote count
Merge pull request #1 from node200ok/master

sync from source