Fixed issue in response class
Merge remote-tracking branch 'origin/0.6.0' into osx