Fixing all dependecy issues
Merge pull request #1 from ehsavoie/BUILD_FIX

Fixing all dependecy issues