ComponentJS compatible
Merge branch 'stouf-componentjs'