Fixes #360
Fixes #359
Merge branch 'master' of github.com:loopj/android-async-http