Resolving #8 #9 (missing dependencies)