ADD: changed fields now marked with color
Merge branch 'master' into production