Merge with satria's evote.tar.gz (2013-01-20)