Fixed #20 new Deps in 0.5.8

some minor refractoring and corrections, version 0.1.7