phoboslab Merge pull request #31 from pfusik/qoa-fu