Merge pull request #24 from richardxia/declare-dependencies