V1.2  - Correct NULL file bug and handle rotation