docs
updated changelog
merged with master