updated to 1.1 branch