Big update

A big update with some changes in the code only to mantain the repository up-to-date