Updated with octopress