Better support for 0.2 (fix #1)