Fix for #7 and #8 backported from NUnit3 #70 and #90
Merge pull request #10 from nunit/backport-issue-70

Fix for #7 and #8 backported from NUnit3 #70 and #90