Merge pull request #4 from dvazquez1027/master

Dependency fixes