Add new components
Fix some issues on the builder
Merge pull request #15 from marmelab/minor_fixes

[RFR] Minor fixes