Add dependencies
Merge remote-tracking branch 'schischu/master'