UPDATE: 3.1 compatibility