Removed remaining incompatibilities with Python 2.6. Fixes #15