Remove kr if zero (0)
Merge branch 'hotfix/1.0.1'