#11 improve ci scripting