Merge branch 'master' into Development
Bug fix

- handy to set an url message
Merge branch 'Development'