merge 0.38 & 0.37
update .gitignore