mnapoli Merge pull request #167 from enumag/patch-2