Refactored dependencies
Merge pull request #57 from shu223/master

Refactored dependencies