merging develop
adding error handling
more tests