TheTechnobear Merge pull request #3 from giuliomoro/master