Merge pull request #1 from jtleek/master