Fixed for Python 3.3
Merged changes