Merge pull request #1 from junit-team/master

merge