Adjusted to use with jekyll
Bug fixes