more normal case logic
Merge branch 'master' of https://github.com/alexrpagan/xfertest