adding files from v0.7.18