Fixed first start issue;
Updated for version 2.1.1