unify header
merge w precise
merge w saucy
merge w master
merge w master
multiple cleanup & fixes
Update TODO.rst
Update TODO.rst
merge w master
merge w master
merge w master
merge with raring
Merge w precise