Some progress on #341 for Linux users - please test