Improved. Final. Version 1.9.5 - error handled