Revamping regex and keyword generating facilities
Merge branch 'develop'