Final v2.01

Slight logic fix for max length