Updating changes while working on windows version of grabber.
Merging
...