Be more system independant.
Merge pull request #10 from marblenix/patch-1

Be more system independant.