Updated examples, main file and aditional component files