fixed dependencies
merge to remote
merged with upstream