Merge pull request #8 from crrodriguez/master