Merge pull request #1 from chalenge/master

Updating to current code base at chalenge:master
Merge pull request #4 from iHub/master

Merge pull request #1 from chalenge/master