pdoify and fix #1