BRANCH 4.2-DEV: added keywords