Ready for 1.1 release compatible with 2.3