modified space is not enugth
added history
Merge branch 'release/release_1.0' into develop