Merge pull requests #356 #357 #358 by jcarlosgarciasegovia