Mac tab completion

Merge fix for #23