Issue #23: replaced std::random_shuffle with std::random