Merge pull request #2 from Raydiation/master

Merge Upstream
Fix dependecies