cleaned build system, fixes #1