Fixing object oriented approach... :P
Merge remote-tracking branch 'origin'
Fixing status variable break.