added fixes after testing on XP and Win7 images
Merge pull request #1 from superponible/master

added fixes after testing on XP and Win7 images