manually sync'ing with the master branch