Port to 0.8.9
Remove print