Merge pull request #1 from xkema/development

watch out
Create hotfix_details
Merge pull request #2 from xkema/hotfix_titles

Create hotfix_details