Doesn't work in Linux

[stuaxo]

(See pull request with fixes).

[Jerdak]

It has been awhile since I looked over your pull requests and I don't recall where I left off in integrating and testing them. I'll give this a go over the weekend.

[stuaxo]

Awesome, cheers :)

[stuaxo]

Hi,
I finally worked out how to view my old PRs in github and going through them.
Any chance of merging some of the PRs? Do you want me to squash the commits ?

Cheers
S