Version 2.1 release ready