integrate the updated source from octopress