merged pull request #72 challenge-module