removed python improved syntax, wierd comments
Merge branch 'master' into command-t