Adapted the regex a bit, version number 1.1.1
Merge branch 'develop'