Final version (hopefully) 1.1