Bug fixes
added skeleton response logic
Completed response logic
Merge remote-tracking branch 'origin/master'