updates
Merge branch 'iros' of git://github.com/joschu/python into iros
more updates
merge and add a few lines to execute script