Code cleanup
Important bugfix about caching result and new vote / remove vote...
Merge branch 'Version/0.3'