Feature/19 improve buildprocess

Fixes #19