Fixed issue #58 - Vortex functionality