Issue 166 - Mac User