updated changelog
merge from dev
publish