merge last updatings #49

Closed halilerkan-cs closed 4 months ago