marcelcaraciolo Merge pull request #81 from chrisgilmerproj/master