new changes
Merge branch 'dev' of github.com:patyatka/exchanger into dev
new changes