Merge pull request #13 from justjavac/master

update