Minor update from 2.1 to 3.1 fix, and fix for fresh install
Updated Version 3.1.16