merged from master - support for big disks - should be fine now