bug
regexp added
Merge branch 'develop' into feature-1