2.1.8 - Release Version, final fixes
2.1.8 - Final Fixes - Release Version