Merge pull request #198 from fsb4000/choosedatadir