Last fixes. Final version 1.0