Merge pull request #1 from kevincennis/master