1.1 update

Should be good to be merged now.