Separate conversion from tallying
Merge pull request #624 from cfailde/bug246

Separate conversion from tallying