Fixed UFT checks in (undefined variable)
Merge branch 'master' of https://github.com/ovregard/BOS