modified to not use dict comprehensions (not available in 2.6)
Merge pull request #2 from lbjay/master

modified to not use dict comprehensions (not available in 2.6)