Rigorous Axiomatic Definition of Entropy Valid Also For Non-Equilibrium States