Merge from master
Bug fixes & improvements