Merge from master
Correcting some code quality issues + improvements