component builders improvements
Merge branch 'master' of github.com:dragome/dragome-sdk