Cleaning the code.
Updates.
Merge remote-tracking branch 'tbc/master'