Merge pull request #2 from macworld/master

update