Fix for incorrect values on blocker page also
Update version tags
Merge branch 'hotfix/0.3.1'