tests
Merge branch 'master' of https://github.com/gkink/Exchange
Merge branch 'master' of https://github.com/gkink/Exchange
cycle, not yet tested
cycle, not yet tested
fixed conflict