CFD-DEM Coupling for Systems of Fluid and Non-Spherical Particles