multiple files, removed loops
1.3 release