re-working for merge of junit runner
Merge pull request #8 from ashleyj/master

re-working for merge of junit runner