adapted to UF 0.4.x (master)
Merge pull request #1 from porcelli/master

adapted to UF 0.4.x (master)