Following upstream
Added documentation