cherrypick files from #38
merge #38
file was not updated, broke jekyll #38