merge from source - octopress blog