Be more system agnostic w.r.t. cross compilation
Merge pull request #212 from Chris00/master

Be more system agnostic w.r.t. cross compilation