Merge pull request #964 from alex/i-hate-strings

No more comma seperated string strings