Merge pull request #145 from ngraziano/99b87f07af0beed3a887