fixing date pleres
Merge origin/master