Version 1.1 branch