Updating fork to 2.0

I hope I won't break anything (I never know what is base and what is head in GIT :disappointed:  )