One step closer to OSX & Linux also fix #73