Fixes and changes
Fixes and changes
Merge branch 'nosolored-master'