Removed Python 2.5 from setup and made sources as close as possible to the original (inserting comments when needed)
Merge branch 'initial'