Merge pull request #1 from luiges90/master

Merge pull request #1 from luiges90/master