Merge pull request #1 from rjdkolb/master

pull