Added option to disable rotation