Included changes from lvaleriu's Branch...

I included many of the changes from lvaleriu's  Branch...

But I removed files wich contain only Whitespace changes...

And put all changes in 4 commits...