Afelipe merge version

The project is in a good momment to merge with master, this has implemented general functions.