Updated to latest upstream and reintegrated binding