Merge pull request #1 from justjavac/master

Update