Merge branch 'master' into develop
remove exceptions in rules
update changes in documentation
Merge branch 'develop'