Merge pull request #166 from msysgit/homeless