Fixed Overflow, Renamed depedencies
Fixed Overflow, Renamed depedencies
Merge branch 'master' into gh-pages