Added introduction and improved rules using colors
Merge branch 'master' into dev