Create Response object and small refactoring inside framework
Merge remote-tracking branch 'origin/master'