Forwardin Nicolas Pull Request