Merge including simple solution to mac issue

@jread-usgs  could you try this? https is apparently causing issues on some platforms.