Replace list comprehension with dict lookup

Improves import time
Bump version to 0.2.1