Added all files from 0.30