Registry Diploma fixes
Merge pull request #354 from diutsu/develop

Registry Diploma fixes