Bug fix iin Accept answer
Merge remote-tracking branch 'upstream/master'
Implemented answer service
Merge pull request #18 from daanvc/master

implemented answer service