Merge pull request #37 from gabriel403/master