Merge pull request #1 from H15teve/master

44