[MERGE] merged the dev branch with enhancement and refactoring of code to generate...