Bug-fix release.
Replaced dict comprehension for python 2.6 compatibility.
Made setup.py a bit more stable.
Bugfix release.