Fixing dependencies (Issue #1)