Added VMware Fusion support and fixed bugs