richardhundt Merge pull request #2 from romariorios/master