Add Python 3.3 compatibility
Merge in 'expressions'