Making some attributes into lists
Merge pull request #31 from adamroach/multistream

Making some attributes into lists