Merge pull request #45 from totten/dist-fixes