fixed issuer 53
fixed hotfix
Merge branch 'iss53'
Merge remote-tracking branch 'origin/master'