Update build system
Merge improved build system