Fixed dependencies
template for #1 and #6