Added Genre support.
Merge pull request #1 from dmcneil/master

Added Genre support