--append
update builder to dispatch init event
Merge pull request #1 from gh0stonio/update_builder

Update builder
Cleanup
Merge pull request #2 from lrqdo/cleanup

Cleanup
Merge remote-tracking branch 'lrqdo/master'