Merge some changes from my private repo to github