Dependencies changed + fixed #31