Added stream support
Merge branch 'master' of github.com:rmuhamedgaliev/ErrorResolver