Added spec and fixed the regex's around scenario capture for issue #26.