Pull request for the Developer Challenge

Thank you,
Mitja