Error Handling, tests and Version 0.0.5