Code cleared
Merge remote-tracking branch 'GH/master'
Some about clearance + stability fix