Closes #24
Merge pull request #26 from audy/fix-qvalue

Closes #24