added mac/linux stuff