merging develop
adding error handling
more tests
error handling
updated tests