Merged improvements into master