Merge pull request #193 from fsb4000/choosedatadir