Merge pull request #78 from geertvh/master

deleted todos
implemented algorithm in the create answer method
Merge pull request #79 from daanvc/master

implemented algorithm in the create answer method