PR #421 - utkarshdalal/GameNative