V3.1.8 updated with latest fix and improvements