fixed dependencies
Merge branch 'master' into drew
Merge branch 'drew'