Use list and generator comprehensions rather than map() in a few cases.
Merge pull request #1 from brunns/master

Use list and generator comprehensions rather than map() in a few cases.