Merge pull request #1 from jjhelmus/master

Update