Merging latest changes in satanas/libturpial repo
Merging changes after pull request
Fixed merge
Working on documentation
Merged with satanas/development