Merge pull request #1 from sandropaganotti/github/master

Github/master