preprare to merge
fixed #44 all test running locally