Windows 7 compatibility added