fixed dependencies
merged