Adding better error handling with tests, updating deps and version
Merging master -> master