Version 1.7
   - Reduced number of files