Merging javier with master
Removing extra files