removed hash
merge upstream