Merge pull request #8 from carlosdmz/master

.