changes by main master
bug fix v1.1 for production
resolved merged conflict
final work for release 2