Merge pull request #15 from porcelli/master

Adapted to most recent UF menu API