local changes
fixed merge conflicts
added poll and changes to comments
Merge branch 'master' of https://github.com/unomena/unobase