changed version 1.1.2
Merge branch 'development' into update