Merge pull request #39 from gabriel403/master