Answer properly associates with current answer
Merge pull request #17 from Vanderln/answers_bugfixes

Answer properly associates with current answer