Minor fix
Merge remote-tracking branch 'origin/master'
Fixed some dependencies after playing around with them a little too much