Simplified
More changes towards Python 2.7 backward compatibility
More changes towards Python 2.7 backward compatibility