Functionality and Exception handling
Merge pull request #2 from chalenge/chalenge_dev

Functionality and Exception handling