added if in convert
Merge branch 'master' of github.com:danielbentonturner/tx-lassos