Drop Curb compatibility (closes #34)