Cleanup
Merge branch 'master' of github.com:aalness/atomic-swap