Merge pull request #1 from griffla/master

update