Don't caclulate swap if none exists
Removed echo that was causing ugly line break
Merge pull request #225 from Swingline0/swap-status-fix

Don't caclulate swap if none exists Fix #223
Merge branch 'master' into refactor