Update AQ-192
Merge pull request #7 from stefanlai/branch6

Update AQ-192