ComponentJS compatible
Merge branch 'stouf-componentjs'
Refactoring, Makefile, integration tests