Merge pull request #7 from itorras13/master