Refactor fill
Merge branch 'org-jekyll-utils'