Fix small bug
Small error handling improvements
Testing improvements
Stable version