Feature/19 improve buildprocess