another attempt at platform independency
Merge pull request #60 from xeno-by/master

another attempt at platform independency