Updated AQP with some ease of use fixes
Merge pull request #19 from sjyk/aqp_fix

Updated AQP with some ease of use fixes