Now works a little more on Linux