Issue #2
- Added some skeleton for error checking
Merge pull request #48 from philstark/Issue_2-Error_checking

Issue #2