Cleaning up some dependencies.
Merge pull request #4 from FlorianZ/master

Cleaning up some dependencies.