Issue 392

I added the Uas from Issue #392 and tests.