Merge pull request #40 from mrtur/2.X-EXPERIMENTAL

aroma-config suggestion