Merge pull request #1073 from gilescope/less-deps