Merge pull request #1 from chalenge/master

Updating to current code base at chalenge:master