Implement ULQ and UQA
Merge branch 'master' of https://github.com/ejtaal/aa