Started implementing dimmer directive
Merge branch 'master'