compatibility with jekyll 1.0; refactoring