brings exchange behaviour up to date
Merge pull request #10 from videlalvaro/master

brings exchange behaviour up to date