Pull request for issue 320

Please consider these changes as fix for https://github.com/unclebob/fitnesse/issues/320