#93 Did it for recent version. Updated a lot of stuff.