Merge pull request #46 from DrMarcII/master

Dependency cleanup.