Fix for special characters
Add additional extended information
Merge pull request #540 from timschofield/develop

Develop