Merge branch 'release/1.2.1' into develop
added borders
rename lib
version
Merge branch 'release/1.2.2'