Fixes and improves
Merge Master