Merge pull request #92 from lbjay/aasplus

Rahul's additional aasplus commits + some cleanup
fixed url encoding issue