bndr Merge pull request #124 from answerquest/patch-1 …