Incorporated review comments PR#74