pydev
Fixed merge conflict
New function to play with