Merge pull request #5 from VictorCabello/New-Awesome-Feature

Add some html. Fixed #1
mad actions
Solve merge problems. fixed #7