Fix dependency issues.
Merge pull request #1 from LeifAndersen/master

Fix dependency issues.